Skip to content

gh-143930: Tweak the exception message and increase test coverage#146476

Merged
ambv merged 5 commits intopython:mainfrom
ambv:gh-143930-followup
Apr 3, 2026
Merged

gh-143930: Tweak the exception message and increase test coverage#146476
ambv merged 5 commits intopython:mainfrom
ambv:gh-143930-followup

Conversation

@ambv
Copy link
Copy Markdown
Contributor

@ambv ambv commented Mar 26, 2026 •
edited by bedevere-app bot
Loading

Based on comments left by Copilot on the backport PRs, there's two minor improvements that I made to the original vulnerability fix.

@ambv ambv added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Mar 26, 2026
@ambv ambv added the skip news label Mar 26, 2026
@ambv ambv requested a review from sethmlarson March 26, 2026 17:20
@bedevere-app bedevere-app bot mentioned this pull request Mar 26, 2026
Open
sethmlarson
sethmlarson reviewed Mar 26, 2026
View reviewed changes
@StanFromIreland StanFromIreland mentioned this pull request Mar 31, 2026
Closed
@picnixz
Copy link
Copy Markdown
Member

picnixz commented Mar 31, 2026

@ambv Before merging can you include the changes in #147948 please?

@picnixz
Copy link
Copy Markdown
Member

picnixz commented Mar 31, 2026

Adding a DO-NOT-MERGE so that you don't forget about it.

@ambv ambv merged commit 3681d47 into python:main Apr 3, 2026
51 checks passed
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Apr 3, 2026

Thanks @ambv for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11, 3.12, 3.13, 3.14.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 3, 2026
@ambv @miss-islington
pythongh-143930: Tweak the exception message and increase test covera…
f7a9aca 
…ge (pythonGH-146476)

(cherry picked from commit 3681d47a440865aead912a054d4599087b4270dd)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Apr 3, 2026

Sorry, @ambv, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3681d47a440865aead912a054d4599087b4270dd 3.13

@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Apr 3, 2026

GH-148042 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Apr 3, 2026
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Apr 3, 2026

Sorry, @ambv, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3681d47a440865aead912a054d4599087b4270dd 3.12

@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Apr 3, 2026

Sorry, @ambv, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3681d47a440865aead912a054d4599087b4270dd 3.11

@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Apr 3, 2026

Sorry, @ambv, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3681d47a440865aead912a054d4599087b4270dd 3.10

ambv added a commit that referenced this pull request Apr 3, 2026
@miss-islington @ambv
[3.14] gh-143930: Tweak the exception message and increase test cover…
594b5a0 
…age (GH-146476) (GH-148042)

(cherry picked from commit 3681d47)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
ambv added a commit to ambv/cpython that referenced this pull request Apr 3, 2026
@ambv
[3.13] pythongh-143930: Tweak the exception message and increase test…
a43f367 
… coverage (pythonGH-146476)

(cherry picked from commit 3681d47)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Apr 3, 2026

GH-148045 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Apr 3, 2026
ambv added a commit that referenced this pull request Apr 3, 2026
@ambv
[3.13] gh-143930: Tweak the exception message and increase test cover…
89bfb8e 
…age (GH-146476) (GH-148045)

(cherry picked from commit 3681d47)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sethmlarson sethmlarson sethmlarson left review comments

Assignees

@ambv ambv

Labels

needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ambv @picnixz @sethmlarson